Fix a variable name clash. (#323475, Ross Burton)

2005-12-07  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktoolbutton.c (clone_image_menu_size): Fix a
	variable name clash.  (#323475, Ross Burton)

diff --git a/ChangeLog b/ChangeLog
index 218b8bd00b58eba5f53ad2eebcf761dc3c003ad2..71782b34381016a8ad8e1a1448018e2e1d4760c2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-07  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtktoolbutton.c (clone_image_menu_size): Fix a 
+       variable name clash.  (#323475, Ross Burton)
+
 2005-12-07  Ross Burton  <ross@burtonini.com>
 
        * docs/reference/gtk/tmpl/gtkenums.sgml:
@@ -7,6 +12,9 @@
 
 2005-12-07  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktoolbutton.c (clone_image_menu_size): Fix a 
+       variable name clash.  (#323475, Ross Burton)
+
        * gtk/gtktreeview.c (gtk_tree_view_key_press): Use the correct
        window when synthesizing the key event.  (#323077,
        Sadrul Habib Chowdhury)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 218b8bd00b58eba5f53ad2eebcf761dc3c003ad2..71782b34381016a8ad8e1a1448018e2e1d4760c2 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-12-07  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtktoolbutton.c (clone_image_menu_size): Fix a 
+       variable name clash.  (#323475, Ross Burton)
+
 2005-12-07  Ross Burton  <ross@burtonini.com>
 
        * docs/reference/gtk/tmpl/gtkenums.sgml:
@@ -7,6 +12,9 @@
 
 2005-12-07  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktoolbutton.c (clone_image_menu_size): Fix a 
+       variable name clash.  (#323475, Ross Burton)
+
        * gtk/gtktreeview.c (gtk_tree_view_key_press): Use the correct
        window when synthesizing the key event.  (#323077,
        Sadrul Habib Chowdhury)

diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c
index 7c06409f357aa9aef6080a581b275d0b0e7bc731..fcb7f92f91d56465d3fb5da8bbe0d160f24220f5 100644 (file)
--- a/gtk/gtktoolbutton.c
+++ b/gtk/gtktoolbutton.c
@@ -562,16 +562,16 @@ clone_image_menu_size (GtkImage *image, GtkSettings *settings)
                                             &width, &height))
        {
          GdkPixbuf *src_pixbuf, *dest_pixbuf;
-         GtkWidget *image;
+         GtkWidget *cloned_image;
 
          src_pixbuf = gtk_image_get_pixbuf (image);
          dest_pixbuf = gdk_pixbuf_scale_simple (src_pixbuf, width, height,
                                                 GDK_INTERP_BILINEAR);
 
-         image = gtk_image_new_from_pixbuf (dest_pixbuf);
+         cloned_image = gtk_image_new_from_pixbuf (dest_pixbuf);
          g_object_unref (dest_pixbuf);
 
-         return image;
+         return cloned_image;
        }
     }